Merge branch 'for-4.4.tmem' of git://xenbits.xen.org/people/konradwilk/xen into staging

diff --cc xen/include/xen/tmem_xen.h
index 9fb74462372182e3aa25b16a32df4de720dc5cc5,034fd5c34a373765c6e3117b86b16c38063b87f2..b26c6faad90727321f90b216ee74319b90e867ae
--- 1/xen/include/xen/tmem_xen.h
--- 2/xen/include/xen/tmem_xen.h
+++ b/xen/include/xen/tmem_xen.h
@@@ -439,10 -328,10 +328,10 @@@ typedef XEN_GUEST_HANDLE(char) cli_va_t
  typedef XEN_GUEST_HANDLE_PARAM(tmem_op_t) tmem_cli_op_t;
  typedef XEN_GUEST_HANDLE_PARAM(char) tmem_cli_va_param_t;
  
- static inline int tmh_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops)
+ static inline int tmem_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops)
  {
  #ifdef CONFIG_COMPAT
 -    if ( is_hvm_vcpu(current) ?
 +    if ( has_hvm_container_vcpu(current) ?
           hvm_guest_x86_mode(current) != 8 :
           is_pv_32on64_vcpu(current) )
      {